blob: 17bd68ca2f32e44752f54acccb696c3060a54d8e [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano7bd050f2011-09-22 06:32:226<meta name="generator" content="AsciiDoc 8.5.2" />
Junio C Hamano68cf15a2010-11-06 01:01:597<title>git-revert(1)</title>
Junio C Hamano1a4e8412005-12-27 08:17:238<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:3120a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano1a4e8412005-12-27 08:17:2327
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:5930 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:2331}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:5935 color: #083194;
Junio C Hamano1a4e8412005-12-27 08:17:2336}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
Junio C Hamanoba4b9282008-07-06 05:20:3150h1, h2, h3 {
Junio C Hamano1a4e8412005-12-27 08:17:2351 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano1a4e8412005-12-27 08:17:2354 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:3156h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano1a4e8412005-12-27 08:17:2362
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano68cf15a2010-11-06 01:01:5977ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano1a4e8412005-12-27 08:17:2381pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:3190 font-size: 1.1em;
Junio C Hamano1a4e8412005-12-27 08:17:2391}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:5994span#revnumber, span#revdate, span#revremark {
Junio C Hamano1a4e8412005-12-27 08:17:2395 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano68cf15a2010-11-06 01:01:59114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano1a4e8412005-12-27 08:17:23118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22121 margin-top: 1.0em;
Junio C Hamano1a4e8412005-12-27 08:17:23122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22125 margin-top: 2.0em;
126 margin-bottom: 2.0em;
127 margin-right: 10%;
128 color: #606060;
Junio C Hamano1a4e8412005-12-27 08:17:23129}
130
131div.content { /* Block element content. */
132 padding: 0;
133}
134
135/* Block element titles. */
136div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59137 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23138 font-family: sans-serif;
139 font-weight: bold;
140 text-align: left;
141 margin-top: 1.0em;
142 margin-bottom: 0.5em;
143}
144div.title + * {
145 margin-top: 0;
146}
147
148td div.title:first-child {
149 margin-top: 0.0em;
150}
151div.content div.title:first-child {
152 margin-top: 0.0em;
153}
154div.content + div.title {
155 margin-top: 0.0em;
156}
157
158div.sidebarblock > div.content {
159 background: #ffffee;
160 border: 1px solid silver;
161 padding: 0.5em;
162}
163
164div.listingblock > div.content {
165 border: 1px solid silver;
166 background: #f4f4f4;
167 padding: 0.5em;
168}
169
Junio C Hamano7bd050f2011-09-22 06:32:22170div.quoteblock, div.verseblock {
171 padding-left: 1.0em;
172 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59173 margin-right: 10%;
Junio C Hamano7bd050f2011-09-22 06:32:22174 border-left: 5px solid #dddddd;
175 color: #777777;
Junio C Hamano1a4e8412005-12-27 08:17:23176}
Junio C Hamano7bd050f2011-09-22 06:32:22177
Junio C Hamano68cf15a2010-11-06 01:01:59178div.quoteblock > div.attribution {
179 padding-top: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23180 text-align: right;
181}
Junio C Hamano68cf15a2010-11-06 01:01:59182
Junio C Hamano68cf15a2010-11-06 01:01:59183div.verseblock > div.content {
184 white-space: pre;
185}
186div.verseblock > div.attribution {
187 padding-top: 0.75em;
188 text-align: left;
189}
190/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31191div.verseblock + div.attribution {
192 text-align: left;
193}
Junio C Hamano1a4e8412005-12-27 08:17:23194
195div.admonitionblock .icon {
196 vertical-align: top;
197 font-size: 1.1em;
198 font-weight: bold;
199 text-decoration: underline;
200 color: #527bbd;
201 padding-right: 0.5em;
202}
203div.admonitionblock td.content {
204 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22205 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23206}
207
208div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22209 border-left: 3px solid #dddddd;
210 padding-left: 0.5em;
Junio C Hamano1a4e8412005-12-27 08:17:23211}
212
Junio C Hamano1a4e8412005-12-27 08:17:23213div.imageblock div.content { padding-left: 0; }
Junio C Hamano1a4e8412005-12-27 08:17:23214span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59215a.image:visited { color: white; }
Junio C Hamano1a4e8412005-12-27 08:17:23216
217dl {
218 margin-top: 0.8em;
219 margin-bottom: 0.8em;
220}
221dt {
222 margin-top: 0.5em;
223 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59224 font-style: normal;
225 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23226}
227dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59228 margin-top: 0.1em;
Junio C Hamano1a4e8412005-12-27 08:17:23229}
230
231ul, ol {
232 list-style-position: outside;
233}
Junio C Hamano68cf15a2010-11-06 01:01:59234ol.arabic {
235 list-style-type: decimal;
236}
237ol.loweralpha {
Junio C Hamano1a4e8412005-12-27 08:17:23238 list-style-type: lower-alpha;
239}
Junio C Hamano68cf15a2010-11-06 01:01:59240ol.upperalpha {
241 list-style-type: upper-alpha;
242}
243ol.lowerroman {
244 list-style-type: lower-roman;
245}
246ol.upperroman {
247 list-style-type: upper-roman;
248}
249
250div.compact ul, div.compact ol,
251div.compact p, div.compact p,
252div.compact div, div.compact div {
253 margin-top: 0.1em;
254 margin-bottom: 0.1em;
255}
Junio C Hamano1a4e8412005-12-27 08:17:23256
257div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31258 border: 3px solid #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23259}
Junio C Hamano7bd050f2011-09-22 06:32:22260thead, p.table.header {
Junio C Hamano1a4e8412005-12-27 08:17:23261 font-family: sans-serif;
262 font-weight: bold;
263}
264tfoot {
265 font-weight: bold;
266}
Junio C Hamano68cf15a2010-11-06 01:01:59267td > div.verse {
268 white-space: pre;
269}
270p.table {
271 margin-top: 0;
272}
273/* Because the table frame attribute is overriden by CSS in most browsers. */
274div.tableblock > table[frame="void"] {
275 border-style: none;
276}
277div.tableblock > table[frame="hsides"] {
278 border-left-style: none;
279 border-right-style: none;
280}
281div.tableblock > table[frame="vsides"] {
282 border-top-style: none;
283 border-bottom-style: none;
284}
Junio C Hamano1a4e8412005-12-27 08:17:23285
Junio C Hamano68cf15a2010-11-06 01:01:59286
287div.hdlist {
Junio C Hamano1a4e8412005-12-27 08:17:23288 margin-top: 0.8em;
289 margin-bottom: 0.8em;
290}
Junio C Hamano68cf15a2010-11-06 01:01:59291div.hdlist tr {
292 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31293}
Junio C Hamano68cf15a2010-11-06 01:01:59294dt.hdlist1.strong, td.hdlist1.strong {
295 font-weight: bold;
296}
297td.hdlist1 {
Junio C Hamano1a4e8412005-12-27 08:17:23298 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59299 font-style: normal;
Junio C Hamano1a4e8412005-12-27 08:17:23300 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59301 color: navy;
Junio C Hamano1a4e8412005-12-27 08:17:23302}
Junio C Hamano68cf15a2010-11-06 01:01:59303td.hdlist2 {
Junio C Hamano1a4e8412005-12-27 08:17:23304 vertical-align: top;
305}
Junio C Hamano68cf15a2010-11-06 01:01:59306div.hdlist.compact tr {
307 margin: 0;
308 padding-bottom: 0;
309}
310
311.comment {
312 background: yellow;
313}
Junio C Hamano1a4e8412005-12-27 08:17:23314
Junio C Hamano7bd050f2011-09-22 06:32:22315.footnote, .footnoteref {
316 font-size: 0.8em;
317}
318
319span.footnote, span.footnoteref {
320 vertical-align: super;
321}
322
323#footnotes {
324 margin: 20px 0 20px 0;
325 padding: 7px 0 0 0;
326}
327
328#footnotes div.footnote {
329 margin: 0 0 5px 0;
330}
331
332#footnotes hr {
333 border: none;
334 border-top: 1px solid silver;
335 height: 1px;
336 text-align: left;
337 margin-left: 0;
338 width: 20%;
339 min-width: 100px;
340}
341
342
Junio C Hamano1a4e8412005-12-27 08:17:23343@media print {
344 div#footer-badges { display: none; }
345}
Junio C Hamanoba4b9282008-07-06 05:20:31346
Junio C Hamano7bd050f2011-09-22 06:32:22347div#toc {
348 margin-bottom: 2.5em;
349}
350
Junio C Hamanoba4b9282008-07-06 05:20:31351div#toctitle {
352 color: #527bbd;
353 font-family: sans-serif;
354 font-size: 1.1em;
355 font-weight: bold;
356 margin-top: 1.0em;
357 margin-bottom: 0.1em;
358}
359
360div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
361 margin-top: 0;
362 margin-bottom: 0;
363}
364div.toclevel2 {
365 margin-left: 2em;
366 font-size: 0.9em;
367}
368div.toclevel3 {
369 margin-left: 4em;
370 font-size: 0.9em;
371}
372div.toclevel4 {
373 margin-left: 6em;
374 font-size: 0.9em;
375}
Junio C Hamano68cf15a2010-11-06 01:01:59376/* Overrides for manpage documents */
377h1 {
378 padding-top: 0.5em;
379 padding-bottom: 0.5em;
380 border-top: 2px solid silver;
381 border-bottom: 2px solid silver;
382}
383h2 {
384 border-style: none;
385}
386div.sectionbody {
387 margin-left: 5%;
388}
389
390@media print {
391 div#toc { display: none; }
392}
393
Junio C Hamano1a4e8412005-12-27 08:17:23394/* Workarounds for IE6's broken and incomplete CSS2. */
395
396div.sidebar-content {
397 background: #ffffee;
398 border: 1px solid silver;
399 padding: 0.5em;
400}
401div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59402 color: #527bbd;
Junio C Hamano1a4e8412005-12-27 08:17:23403 font-family: sans-serif;
404 font-weight: bold;
405 margin-top: 0.0em;
406 margin-bottom: 0.5em;
407}
408
409div.listingblock div.content {
410 border: 1px solid silver;
411 background: #f4f4f4;
412 padding: 0.5em;
413}
414
Junio C Hamano68cf15a2010-11-06 01:01:59415div.quoteblock-attribution {
416 padding-top: 0.5em;
417 text-align: right;
418}
419
420div.verseblock-content {
421 white-space: pre;
422}
423div.verseblock-attribution {
424 padding-top: 0.75em;
425 text-align: left;
Junio C Hamano1a4e8412005-12-27 08:17:23426}
427
428div.exampleblock-content {
Junio C Hamano7bd050f2011-09-22 06:32:22429 border-left: 3px solid #dddddd;
Junio C Hamano1a4e8412005-12-27 08:17:23430 padding-left: 0.5em;
431}
Junio C Hamanoba4b9282008-07-06 05:20:31432
433/* IE6 sets dynamically generated links as visited. */
434div#toc a:visited { color: blue; }
Junio C Hamano1a4e8412005-12-27 08:17:23435</style>
Junio C Hamano7bd050f2011-09-22 06:32:22436<script type="text/javascript">
437/*<![CDATA[*/
438window.onload = function(){asciidoc.footnotes();}
439var asciidoc = { // Namespace.
440
441/////////////////////////////////////////////////////////////////////
442// Table Of Contents generator
443/////////////////////////////////////////////////////////////////////
444
445/* Author: Mihai Bazon, September 2002
446 * http://students.infoiasi.ro/~mishoo
447 *
448 * Table Of Content generator
449 * Version: 0.4
450 *
451 * Feel free to use this script under the terms of the GNU General Public
452 * License, as long as you do not remove or alter this notice.
453 */
454
455 /* modified by Troy D. Hanson, September 2006. License: GPL */
456 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
457
458// toclevels = 1..4.
459toc: function (toclevels) {
460
461 function getText(el) {
462 var text = "";
463 for (var i = el.firstChild; i != null; i = i.nextSibling) {
464 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
465 text += i.data;
466 else if (i.firstChild != null)
467 text += getText(i);
468 }
469 return text;
470 }
471
472 function TocEntry(el, text, toclevel) {
473 this.element = el;
474 this.text = text;
475 this.toclevel = toclevel;
476 }
477
478 function tocEntries(el, toclevels) {
479 var result = new Array;
480 var re = new RegExp('[hH]([2-'+(toclevels+1)+'])');
481 // Function that scans the DOM tree for header elements (the DOM2
482 // nodeIterator API would be a better technique but not supported by all
483 // browsers).
484 var iterate = function (el) {
485 for (var i = el.firstChild; i != null; i = i.nextSibling) {
486 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
487 var mo = re.exec(i.tagName);
488 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
489 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
490 }
491 iterate(i);
492 }
493 }
494 }
495 iterate(el);
496 return result;
497 }
498
499 var toc = document.getElementById("toc");
500 var entries = tocEntries(document.getElementById("content"), toclevels);
501 for (var i = 0; i < entries.length; ++i) {
502 var entry = entries[i];
503 if (entry.element.id == "")
504 entry.element.id = "_toc_" + i;
505 var a = document.createElement("a");
506 a.href = "#" + entry.element.id;
507 a.appendChild(document.createTextNode(entry.text));
508 var div = document.createElement("div");
509 div.appendChild(a);
510 div.className = "toclevel" + entry.toclevel;
511 toc.appendChild(div);
512 }
513 if (entries.length == 0)
514 toc.parentNode.removeChild(toc);
515},
516
517
518/////////////////////////////////////////////////////////////////////
519// Footnotes generator
520/////////////////////////////////////////////////////////////////////
521
522/* Based on footnote generation code from:
523 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
524 */
525
526footnotes: function () {
527 var cont = document.getElementById("content");
528 var noteholder = document.getElementById("footnotes");
529 var spans = cont.getElementsByTagName("span");
530 var refs = {};
531 var n = 0;
532 for (i=0; i<spans.length; i++) {
533 if (spans[i].className == "footnote") {
534 n++;
535 // Use [\s\S] in place of . so multi-line matches work.
536 // Because JavaScript has no s (dotall) regex flag.
537 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
538 noteholder.innerHTML +=
539 "<div class='footnote' id='_footnote_" + n + "'>" +
540 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
541 n + "</a>. " + note + "</div>";
542 spans[i].innerHTML =
543 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
544 "' title='View footnote' class='footnote'>" + n + "</a>]";
545 var id =spans[i].getAttribute("id");
546 if (id != null) refs["#"+id] = n;
547 }
548 }
549 if (n == 0)
550 noteholder.parentNode.removeChild(noteholder);
551 else {
552 // Process footnoterefs.
553 for (i=0; i<spans.length; i++) {
554 if (spans[i].className == "footnoteref") {
555 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
556 href = href.match(/#.*/)[0]; // Because IE return full URL.
557 n = refs[href];
558 spans[i].innerHTML =
559 "[<a href='#_footnote_" + n +
560 "' title='View footnote' class='footnote'>" + n + "</a>]";
561 }
562 }
563 }
564}
565
566}
567/*]]>*/
568</script>
Junio C Hamano1a4e8412005-12-27 08:17:23569</head>
570<body>
571<div id="header">
572<h1>
573git-revert(1) Manual Page
574</h1>
575<h2>NAME</h2>
576<div class="sectionbody">
577<p>git-revert -
Junio C Hamano89a57342010-06-22 23:22:55578 Revert some existing commits
Junio C Hamano1a4e8412005-12-27 08:17:23579</p>
580</div>
581</div>
Junio C Hamano7bd050f2011-09-22 06:32:22582<div id="content">
Junio C Hamano68cf15a2010-11-06 01:01:59583<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23584<div class="sectionbody">
Junio C Hamano15567bc2011-07-23 00:51:59585<div class="verseblock">
586<div class="verseblock-content"><em>git revert</em> [--edit | --no-edit] [-n] [-m parent-number] [-s] &lt;commit&gt;&#8230;</div>
587<div class="verseblock-attribution">
588</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23589</div>
Junio C Hamanoba4b9282008-07-06 05:20:31590<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23591<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59592<div class="paragraph"><p>Given one or more existing commits, revert the changes that the
Junio C Hamano89a57342010-06-22 23:22:55593related patches introduce, and record some new commits that record
594them. This requires your working tree to be clean (no modifications
595from the HEAD commit).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59596<div class="paragraph"><p>Note: <em>git revert</em> is used to record some new commits to reverse the
Junio C Hamano89a57342010-06-22 23:22:55597effect of some earlier commits (often only a faulty one). If you want to
Junio C Hamano3580ad22008-08-21 00:27:40598throw away all uncommitted changes in your working directory, you
599should see <a href="git-reset.html">git-reset(1)</a>, particularly the <em>--hard</em> option. If
600you want to extract specific files as they were in another commit, you
Junio C Hamano1aa40d22010-01-21 17:46:43601should see <a href="git-checkout.html">git-checkout(1)</a>, specifically the <tt>git checkout
Junio C Hamano360e3a12011-07-13 23:51:56602&lt;commit&gt; -- &lt;filename&gt;</tt> syntax. Take care with these alternatives as
Junio C Hamano3580ad22008-08-21 00:27:40603both will discard uncommitted changes in your working directory.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23604</div>
Junio C Hamanoba4b9282008-07-06 05:20:31605<h2 id="_options">OPTIONS</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23606<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59607<div class="dlist"><dl>
608<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55609&lt;commit&gt;&#8230;
Junio C Hamano1a4e8412005-12-27 08:17:23610</dt>
611<dd>
612<p>
Junio C Hamano89a57342010-06-22 23:22:55613 Commits to revert.
Junio C Hamano2d47c622007-01-18 06:24:10614 For a more complete list of ways to spell commit names, see
Junio C Hamanoc27b7332010-10-14 04:37:28615 <a href="gitrevisions.html">gitrevisions(7)</a>.
Junio C Hamano89a57342010-06-22 23:22:55616 Sets of commits can also be given but no traversal is done by
617 default, see <a href="git-rev-list.html">git-rev-list(1)</a> and its <em>--no-walk</em>
618 option.
Junio C Hamano1a4e8412005-12-27 08:17:23619</p>
620</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59621<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47622-e
623</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59624<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47625--edit
Junio C Hamano1a4e8412005-12-27 08:17:23626</dt>
627<dd>
628<p>
Junio C Hamano1aa40d22010-01-21 17:46:43629 With this option, <em>git revert</em> will let you edit the commit
Junio C Hamano0e661132008-01-21 02:37:44630 message prior to committing the revert. This is the default if
Junio C Hamano1a4e8412005-12-27 08:17:23631 you run the command from a terminal.
632</p>
633</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59634<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47635-m parent-number
636</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59637<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47638--mainline parent-number
Junio C Hamanod814b6d2007-11-04 11:13:49639</dt>
640<dd>
641<p>
642 Usually you cannot revert a merge because you do not know which
643 side of the merge should be considered the mainline. This
644 option specifies the parent number (starting from 1) of
645 the mainline and allows revert to reverse the change
646 relative to the specified parent.
647</p>
Junio C Hamano68cf15a2010-11-06 01:01:59648<div class="paragraph"><p>Reverting a merge commit declares that you will never want the tree changes
Junio C Hamanof1231492008-12-22 08:27:21649brought in by the merge. As a result, later merges will only bring in tree
650changes introduced by commits that are not ancestors of the previously
651reverted merge. This may or may not be what you want.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59652<div class="paragraph"><p>See the <a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for
Junio C Hamanof1231492008-12-22 08:27:21653more details.</p></div>
Junio C Hamanod814b6d2007-11-04 11:13:49654</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59655<dt class="hdlist1">
Junio C Hamano1a4e8412005-12-27 08:17:23656--no-edit
657</dt>
658<dd>
659<p>
Junio C Hamano1aa40d22010-01-21 17:46:43660 With this option, <em>git revert</em> will not start the commit
Junio C Hamano1a4e8412005-12-27 08:17:23661 message editor.
662</p>
663</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59664<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47665-n
666</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59667<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47668--no-commit
Junio C Hamano1a4e8412005-12-27 08:17:23669</dt>
670<dd>
671<p>
Junio C Hamano89a57342010-06-22 23:22:55672 Usually the command automatically creates some commits with
673 commit log messages stating which commits were
674 reverted. This flag applies the changes necessary
675 to revert the named commits to your working tree
676 and the index, but does not make the commits. In addition,
Junio C Hamanof69a0a02008-07-17 08:08:47677 when this option is used, your index does not have to match
678 the HEAD commit. The revert is done against the
679 beginning state of your index.
Junio C Hamano1a4e8412005-12-27 08:17:23680</p>
Junio C Hamano68cf15a2010-11-06 01:01:59681<div class="paragraph"><p>This is useful when reverting more than one commits'
Junio C Hamanof69a0a02008-07-17 08:08:47682effect to your index in a row.</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23683</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59684<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47685-s
686</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59687<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47688--signoff
Junio C Hamano6d76d612008-05-09 05:46:08689</dt>
690<dd>
691<p>
692 Add Signed-off-by line at the end of the commit message.
693</p>
694</dd>
Junio C Hamano23e3f532011-02-10 02:05:29695<dt class="hdlist1">
696--strategy=&lt;strategy&gt;
697</dt>
698<dd>
699<p>
700 Use the given merge strategy. Should only be used once.
701 See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
702 for details.
703</p>
704</dd>
705<dt class="hdlist1">
706-X&lt;option&gt;
707</dt>
708<dt class="hdlist1">
709--strategy-option=&lt;option&gt;
710</dt>
711<dd>
712<p>
713 Pass the merge strategy-specific option through to the
714 merge strategy. See <a href="git-merge.html">git-merge(1)</a> for details.
715</p>
716</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31717</dl></div>
Junio C Hamano1a4e8412005-12-27 08:17:23718</div>
Junio C Hamano89a57342010-06-22 23:22:55719<h2 id="_examples">EXAMPLES</h2>
720<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59721<div class="dlist"><dl>
722<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45723<tt>git revert HEAD~3</tt>
Junio C Hamano89a57342010-06-22 23:22:55724</dt>
725<dd>
726<p>
727 Revert the changes specified by the fourth last commit in HEAD
728 and create a new commit with the reverted changes.
729</p>
730</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59731<dt class="hdlist1">
Junio C Hamano16ebcd02011-08-05 00:05:45732<tt>git revert -n master&#126;5..master&#126;2</tt>
Junio C Hamano89a57342010-06-22 23:22:55733</dt>
734<dd>
735<p>
736 Revert the changes done by commits from the fifth last commit
737 in master (included) to the third last commit in master
738 (included), but do not create any commit with the reverted
739 changes. The revert only modifies the working tree and the
740 index.
741</p>
742</dd>
743</dl></div>
744</div>
Junio C Hamano89a57342010-06-22 23:22:55745<h2 id="_see_also">SEE ALSO</h2>
746<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59747<div class="paragraph"><p><a href="git-cherry-pick.html">git-cherry-pick(1)</a></p></div>
Junio C Hamano89a57342010-06-22 23:22:55748</div>
Junio C Hamanoba4b9282008-07-06 05:20:31749<h2 id="_git">GIT</h2>
Junio C Hamano1a4e8412005-12-27 08:17:23750<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59751<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano1a4e8412005-12-27 08:17:23752</div>
Junio C Hamano7bd050f2011-09-22 06:32:22753</div>
754<div id="footnotes"><hr /></div>
Junio C Hamano1a4e8412005-12-27 08:17:23755<div id="footer">
756<div id="footer-text">
Junio C Hamano7bd050f2011-09-22 06:32:22757Last updated 2011-09-21 23:01:14 PDT
Junio C Hamano1a4e8412005-12-27 08:17:23758</div>
759</div>
760</body>
761</html>